Merge from emacs-24; up to 2012-12-07T15:31:43Z!cyd@gnu.org

author Glenn Morris <rgm@gnu.org>

Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)

committer Glenn Morris <rgm@gnu.org>

Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
author Glenn Morris <rgm@gnu.org>
Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
committer Glenn Morris <rgm@gnu.org>
Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
diff --cc doc/lispref/ChangeLog
Simple merge
diff --cc doc/lispref/windows.texi
Simple merge
diff --cc doc/misc/ChangeLog
Simple merge
author	Glenn Morris <rgm@gnu.org>
	Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
committer	Glenn Morris <rgm@gnu.org>
	Sun, 6 Jan 2013 20:34:54 +0000 (12:34 -0800)
		1	2
doc/lispref/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history
doc/lispref/windows.texi	patch \|	diff1 \|	diff2 \|	blob \| history
doc/misc/ChangeLog	patch \|	diff1 \|	diff2 \|	blob \| history